90a9550a663ea97b93d0cd6e027943c9560558f7,applications/content/src/org/ofbiz/content/data/DataResourceWorker.java,DataResourceWorker,renderDataResourceAsText,#GenericDelegator#String#Appendable#Map#Locale#String#boolean#,578

Before Change


                    }
                    // render the screen
                    ScreenStringRenderer renderer = screens.getScreenStringRenderer();
                    String combinedName = (String) dataResource.get("objectInfo");
                    ModelScreen modelScreen = ScreenFactory.getScreenFromLocation(combinedName);
                    modelScreen.renderScreenString(out, context, renderer);
                } catch (SAXException e) {

After Change


                    // render the screen
                    ModelScreen modelScreen = null;
                	ScreenStringRenderer renderer = screens.getScreenStringRenderer();
                	String combinedName = dataResource.getString("objectInfo");
                    if ("URL_RESOURCE".equals(dataResource.getString("dataResourceTypeId")) && UtilValidate.isNotEmpty(combinedName) && combinedName.startsWith("component://")) { 
                    	modelScreen = ScreenFactory.getScreenFromLocation(combinedName);
                    } else { // stored in  a single file